Added major future proofing and optimizations