Updated resources to use handlers