Refactor to use android annotation