Prepared for code changes