to comply with new architecture